Merge branch '3.4' into 4.2

* 3.4:
  use terminal instead of bash

Author: javiereguiluz

components/dotenv.rst

@@ -47,7 +47,7 @@ Load a ``.env`` file in your PHP application via ``Dotenv::load()``::
 
 Given the following ``.env`` file content:
 
-.. code-block:: bash
+.. code-block:: terminal
 
     # .env
     DB_USER=root
@@ -84,22 +84,22 @@ shell scripts:
 
 Add comments by prefixing them with ``#``:
 
-.. code-block:: bash
+.. code-block:: terminal
 
     # Database credentials
     DB_USER=root
     DB_PASS=pass # This is the secret password
 
 Use environment variables in values by prefixing variables with ``$``:
 
-.. code-block:: bash
+.. code-block:: terminal
 
     DB_USER=root
     DB_PASS=${DB_USER}pass # Include the user as a password prefix
 
 Embed commands via ``$()`` (not supported on Windows):
 
-.. code-block:: bash
+.. code-block:: terminal
 
     START_TIME=$(date)
 

components/phpunit_bridge.rst

@@ -587,7 +587,7 @@ It's also possible to set this env var in the ``phpunit.xml.dist`` file.
 
 If you have installed the bridge through Composer, you can run it by calling e.g.:
 
-.. code-block:: bash
+.. code-block:: terminal
 
     $ vendor/bin/simple-phpunit
 

configuration/micro_kernel_trait.rst

@@ -14,7 +14,7 @@ A Single-File Symfony Application
 Start with a completely empty directory and install these Symfony components
 via Composer:
 
-.. code-block:: bash
+.. code-block:: terminal
 
     $ composer require symfony/config symfony/http-kernel \
       symfony/http-foundation symfony/routing \

performance.rst

@@ -123,7 +123,7 @@ in ``vendor/composer/autoload_classmap.php``.
 Execute this command to generate the class map (and make it part of your
 deployment process too):
 
-.. code-block:: bash
+.. code-block:: terminal
 
     $ composer dump-autoload --optimize --no-dev --classmap-authoritative
 

security/guard_authentication.rst

@@ -252,7 +252,7 @@ Finally, configure your ``firewalls`` key in ``security.yaml`` to use this authe
 You did it! You now have a fully-working API token authentication system. If your
 homepage required ``ROLE_USER``, then you could test it under different conditions:
 
-.. code-block:: bash
+.. code-block:: terminal
 
     # test with no token
     curl http://localhost:8000/
@@ -382,7 +382,7 @@ to cause a failure::
 In this case, since "ILuvAPIs" is a ridiculous API key, you could include an easter
 egg to return a custom message if someone tries this:
 
-.. code-block:: bash
+.. code-block:: terminal
 
     curl -H "X-AUTH-TOKEN: ILuvAPIs" http://localhost:8000/
     # {"message":"ILuvAPIs is not a real API key: it's just a silly phrase"}