Skip to content

Commit 5cc89e7

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: Updated related to Symfony installation and Symfony Flex
2 parents 80ba67a + 2e75409 commit 5cc89e7

25 files changed

+194
-289
lines changed

bundles.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ file::
3737

3838
.. tip::
3939

40-
In a default Symfony application that uses :doc:`Symfony Flex </setup/flex>`,
40+
In a default Symfony application that uses :ref:`Symfony Flex <symfony-flex>`,
4141
bundles are enabled/disabled automatically for you when installing/removing
4242
them, so you don't need to look at or edit this ``bundles.php`` file.
4343

bundles/best_practices.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ Installation
246246
------------
247247

248248
Bundles should set ``"type": "symfony-bundle"`` in their ``composer.json`` file.
249-
With this, :doc:`Symfony Flex </setup/flex>` will be able to automatically
249+
With this, :ref:`Symfony Flex <symfony-flex>` will be able to automatically
250250
enable your bundle when it's installed.
251251

252252
If your bundle requires any setup (e.g. configuration, new files, changes to

configuration.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ stores the configuration of every package installed in your application.
3030
Packages (also called "bundles" in Symfony and "plugins/modules" in other
3131
projects) add ready-to-use features to your projects.
3232

33-
When using :doc:`Symfony Flex </setup/flex>`, which is enabled by default in
33+
When using :ref:`Symfony Flex <symfony-flex>`, which is enabled by default in
3434
Symfony applications, packages update the ``bundles.php`` file and create new
3535
files in ``config/packages/`` automatically during their installation. For
3636
example, this is the default file created by the "API Platform" package:
@@ -555,7 +555,7 @@ This is for example the content of the ``.env`` file to define the value of the
555555
556556
In addition to your own env vars, this ``.env`` file also contains the env vars
557557
defined by the third-party packages installed in your application (they are
558-
added automatically by :doc:`Symfony Flex </setup/flex>` when installing packages).
558+
added automatically by :ref:`Symfony Flex <symfony-flex>` when installing packages).
559559

560560
.. _configuration-env-var-in-prod:
561561

@@ -565,7 +565,7 @@ Configuring Environment Variables in Production
565565
In production, the ``.env`` files are also parsed and loaded on each request so
566566
you can override the env vars already defined in the server. In order to improve
567567
performance, you can run the ``dump-env`` command (available when using
568-
:doc:`Symfony Flex </setup/flex>` 1.2 or later).
568+
:ref:`Symfony Flex <symfony-flex>` 1.2 or later).
569569

570570
This command parses all the ``.env`` files once and compiles their contents into
571571
a new PHP-optimized file called ``.env.local.php``. From that moment, Symfony

contributing/code/security.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ Security Advisories
169169
.. tip::
170170

171171
You can check your Symfony application for known security vulnerabilities
172-
using the ``security:check`` command provided by the
173-
:ref:`Symfony security checker <security-checker>`.
172+
using :ref:`the security:check command <security-checker>`.
174173

175174
Check the `Security Advisories`_ blog category for a list of all security
176175
vulnerabilities that were fixed in Symfony releases, starting from Symfony

controller/error_pages.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Fortunately, the default ``ExceptionController`` allows you to preview your
150150
*error* pages during development.
151151

152152
To use this feature, you need to load some special routes provided by TwigBundle
153-
(if the application uses :doc:`Symfony Flex </setup/flex>` they are loaded
153+
(if the application uses :ref:`Symfony Flex <symfony-flex>` they are loaded
154154
automatically when installing Twig support):
155155

156156
.. configuration-block::

deployment.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ as you normally do:
170170

171171
If you get a "class not found" error during this step, you may need to
172172
run ``export APP_ENV=prod`` (or ``export SYMFONY_ENV=prod`` if you're not
173-
using :doc:`Symfony Flex </setup/flex>`) before running this command so
173+
using :ref:`Symfony Flex <symfony-flex>`) before running this command so
174174
that the ``post-install-cmd`` scripts run in the ``prod`` environment.
175175

176176
D) Clear your Symfony Cache

email.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ own mail servers as well as using popular email providers like `Mandrill`_,
1717
Installation
1818
------------
1919

20-
In applications using :doc:`Symfony Flex </setup/flex>`, run this command to
20+
In applications using :ref:`Symfony Flex <symfony-flex>`, run this command to
2121
install the Swift Mailer based mailer before using it:
2222

2323
.. code-block:: terminal

forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ learning the most important features of the form library along the way.
1717
Installation
1818
------------
1919

20-
In applications using :doc:`Symfony Flex </setup/flex>`, run this command to
20+
In applications using :ref:`Symfony Flex <symfony-flex>`, run this command to
2121
install the form feature before using it:
2222

2323
.. code-block:: terminal

frontend/encore/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ project:
1616
$ composer require symfony/webpack-encore-bundle
1717
$ yarn install
1818
19-
If you are using :doc:`Symfony Flex </setup/flex>`, this will install and enable
19+
If you are using :ref:`Symfony Flex <symfony-flex>`, this will install and enable
2020
the `WebpackEncoreBundle`_, create the ``assets/`` directory, add a
2121
``webpack.config.js`` file, and add ``node_modules/`` to ``.gitignore``. You can
2222
skip the rest of this article and go write your first JavaScript and CSS by

mailer.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ Postmark ``composer require symfony/postmark-mailer``
5050
SendGrid ``composer require symfony/sendgrid-mailer``
5151
================== =============================================
5252

53-
Each library includes a :ref:`Flex recipe <flex-recipe>` that will add example configuration
54-
to your ``.env`` file. For example, suppose you want to use SendGrid. First,
55-
install it:
53+
Each library includes a :ref:`Symfony Flex recipe <symfony-flex>` that will add
54+
example configuration to your ``.env`` file. For example, suppose you want to
55+
use SendGrid. First, install it:
5656

5757
.. code-block:: terminal
5858

0 commit comments

Comments
 (0)