8000 Merge branch '4.2' · symfony/symfony-docs@dd0bbc7 · GitHub
[go: up one dir, main page]
Skip to content

Commit dd0bbc7

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '4.2'
* 4.2: use terminal instead of bash
2 parents f034d99 + ed9dc2b commit dd0bbc7

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

‎components/dotenv.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Load a ``.env`` file in your PHP application via ``Dotenv::load()``::
4747

4848
Given the following ``.env`` file content:
4949

50-
.. code-block:: bash
50+
.. code-block:: terminal
5151
5252
# .env
5353
DB_USER=root
@@ -84,22 +84,22 @@ shell scripts:
8484
8585
Add comments by prefixing them with ``#``:
8686

87-
.. code-block:: bash
87+
.. code-block:: terminal
8888
8989
# Database credentials
9090
DB_USER=root
9191
DB_PASS=pass # This is the secret password
9292
9393
Use environment variables in values by prefixing variables with ``$``:
9494

95-
.. code-block:: bash
95+
.. code-block:: terminal
9696
9797
DB_USER=root
9898
DB_PASS=${DB_USER}pass # Include the user as a password prefix
9999
100100
Embed commands via ``$()`` (not supported on Windows):
101101

102-
.. code-block:: bash
102+
.. code-block:: terminal
103103
104104
START_TIME=$(date)
105105

‎components/phpunit_bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ It's also possible to set this env var in the ``phpunit.xml.dist`` file.
587587

588588
If you have installed the bridge through Composer, you can run it by calling e.g.:
589589

590-
.. code-block:: bash
590+
.. code-block:: terminal
591591
592592
$ vendor/bin/simple-phpunit
593593

‎configuration/micro_kernel_trait.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ A Single-File Symfony Application
1414
Start with a completely empty directory and install these Symfony components
1515
via Composer:
1616

17-
.. code-block:: bash
17+
.. code-block:: terminal
1818
1919
$ composer require symfony/config symfony/http-kernel \
2020
symfony/http-foundation symfony/routing \

‎performance.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ in ``vendor/composer/autoload_classmap.php``.
123123
Execute this command to generate the class map (and make it part of your
124124
deployment process too):
125125

126-
.. code-block:: bash
126+
.. code-block:: terminal
127127
128128
$ composer dump-autoload --optimize --no-dev --classmap-authoritative
129129

‎security/guard_authentication.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ Finally, configure your ``firewalls`` key in ``security.yaml`` to use this authe
252252
You did it! You now have a fully-working API token authentication system. If your
253253
homepage required ``ROLE_USER``, then you could test it under different conditions:
254254

255-
.. code-block:: bash
255+
.. code-block:: terminal
256256
257257
# test with no token
258258
curl http://localhost:8000/
@@ -382,7 +382,7 @@ to cause a failure::
382382
In this case, since "ILuvAPIs" is a ridiculous API key, you could include an easter
383383
egg to return a custom message if someone tries this:
384384

385-
.. code-block:: bash
385+
.. code-block:: terminal
386386
387387
curl -H "X-AUTH-TOKEN: ILuvAPIs" http://localhost:8000/
388388
# {"message":"ILuvAPIs is not a real API key: it's just a silly phrase"}

0 commit comments

Comments
 (0)
0