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

Commit 81f8ca0

Browse files
OskarStarkOskarStark
committed
Merge branch '5.0'
* 5.0: Fix compiler pass phase when extensions that implements CompilerPassInterface are executed fix: very_verbose mode shows estimated time Fix versions in Upgrading Major Version
2 parents 6113a66 + 9c1e884 commit 81f8ca0

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

‎components/console/helpers/progressbar.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ level of verbosity of the ``OutputInterface`` instance:
141141
3/3 [============================] 100% 1 sec
142142
143143
# OutputInterface::VERBOSITY_VERY_VERBOSE (-vv)
144-
0/3 [>---------------------------] 0% 1 sec
145-
1/3 [=========>------------------] 33% 1 sec
146-
3/3 [============================] 100% 1 sec
144+
0/3 [>---------------------------] 0% 1 sec/1 sec
145+
1/3 [=========>------------------] 33% 1 sec/1 sec
146+
3/3 [============================] 100% 1 sec/1 sec
147147
148148
# OutputInterface::VERBOSITY_DEBUG (-vvv)
149149
0/3 [>---------------------------] 0% 1 sec/1 sec 1.0 MB

‎components/dependency_injection/compilation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ methods described in :doc:`/service_container/definitions`.
341341
.. note::
342342

343343
Please note that the ``process()`` method in the extension class is
344-
called during the optimization step. You can read
344+
called during the ``PassConfig::TYPE_BEFORE_OPTIMIZATION`` step. You can read
345345
:ref:`the next section <components-di-separate-compiler-passes>` if you
346346
need to edit the container during another step.
347347

‎setup/upgrade_major.rst

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -135,46 +135,34 @@ starting with ``symfony/`` to the new major version:
135135
"...": "...",
136136
137137
"require": {
138-
- "symfony/cache": "4.3.*",
139-
+ "symfony/cache": "4.4.*",
140-
- "symfony/config": "4.3.*",
141-
+ "symfony/config": "4.4.*",
142-
- "symfony/console": "4.3.*",
143-
+ "symfony/console": "4.4.*",
138+
- "symfony/cache": "4.4.*",
139+
+ "symfony/cache": "5.0.*",
140+
- "symfony/config": "4.4.*",
141+
+ "symfony/config": "5.0.*",
142+
- "symfony/console": "4.4.*",
143+
+ "symfony/console": "5.0.*",
144144
"...": "...",
145145
146146
"...": "A few libraries starting with
147-
symfony/ follow their versioning scheme. You
147+
symfony/ follow their own versioning scheme. You
148148
do not need to update these versions: you can
149149
upgrade them independently whenever you want",
150150
"symfony/monolog-bundle": "^3.5",
151151
},
152152
"...": "...",
153153
}
154154
155-
Your ``composer.json`` file should also have an ``extra`` block that you will
156-
*also* need to update:
157-
158-
.. code-block:: diff
159-
160-
"extra": {
161-
"symfony": {
162-
"...": "...",
163-
- "require": "4.4.*"
164-
+ "require": "5.0.*"
165-
}
166-
}
167-
168155
At the bottom of your ``composer.json`` file, in the ``extra`` block you can
169156
find a data setting for the Symfony version. Make sure to also upgrade
170157
this one. For instance, update it to ``5.0.*`` to upgrade to Symfony 5.0:
171158

172-
.. code-block:: json
159+
.. code-block:: diff
173160
174161
"extra": {
175162
"symfony": {
176163
"allow-contrib": false,
177-
"require": "5.0.*"
164+
- "require": "4.4.*"
165+
+ "require": "5.0.*"
178166
}
179167
}
180168

0 commit comments

Comments
 (0)
0