Skip to content

Commit 3be6575

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Config] Delete a page that it's no longer needed [Contributing] Update the footnotes of the BC article Minor: Deleting link add alternative method to force version with symfony/flex
2 parents db90899 + 4c6b14d commit 3be6575

File tree

5 files changed

+111
-188
lines changed

5 files changed

+111
-188
lines changed

bundles/best_practices.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ with Symfony Flex to install a specific Symfony version:
233233
234234
# this requires Symfony 5.x for all Symfony packages
235235
export SYMFONY_REQUIRE=5.*
236+
# alternatively you can run this command to update composer.json config
237+
# composer config extra.symfony.require "5.*"
236238
237239
# install Symfony Flex in the CI environment
238240
composer global config --no-plugins allow-plugins.symfony/flex true

configuration.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -797,12 +797,6 @@ the env files ending in ``.local`` (``.env.local`` and ``.env.<environment>.loca
797797
**should not be committed** because only you will use them. In fact, the
798798
``.gitignore`` file that comes with Symfony prevents them from being committed.
799799

800-
.. caution::
801-
802-
Applications created before November 2018 had a slightly different system,
803-
involving a ``.env.dist`` file. For information about upgrading, see:
804-
:doc:`configuration/dot-env-changes`.
805-
806800
.. _configuration-env-var-in-prod:
807801

808802
Configuring Environment Variables in Production

configuration/dot-env-changes.rst

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)