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

Author: OskarStark

components/console/helpers/progressbar.rst

@@ -141,9 +141,9 @@ level of verbosity of the ``OutputInterface`` instance:
      3/3 [============================] 100%  1 sec
 
     # OutputInterface::VERBOSITY_VERY_VERBOSE (-vv)
-     0/3 [>---------------------------]   0%  1 sec
-     1/3 [=========>------------------]  33%  1 sec
-     3/3 [============================] 100%  1 sec
+     0/3 [>---------------------------]   0%  1 sec/1 sec
+     1/3 [=========>------------------]  33%  1 sec/1 sec
+     3/3 [============================] 100%  1 sec/1 sec
 
     # OutputInterface::VERBOSITY_DEBUG (-vvv)
      0/3 [>---------------------------]   0%  1 sec/1 sec  1.0 MB

components/dependency_injection/compilation.rst

@@ -341,7 +341,7 @@ methods described in :doc:`/service_container/definitions`.
 .. note::
 
     Please note that the ``process()`` method in the extension class is
-    called during the optimization step. You can read
+    called during the ``PassConfig::TYPE_BEFORE_OPTIMIZATION`` step. You can read
     :ref:`the next section <components-di-separate-compiler-passes>` if you
     need to edit the container during another step.
 

setup/upgrade_major.rst

@@ -135,46 +135,34 @@ starting with ``symfony/`` to the new major version:
         "...": "...",
 
         "require": {
-    -         "symfony/cache": "4.3.*",
-    +         "symfony/cache": "4.4.*",
-    -         "symfony/config": "4.3.*",
-    +         "symfony/config": "4.4.*",
-    -         "symfony/console": "4.3.*",
-    +         "symfony/console": "4.4.*",
+    -         "symfony/cache": "4.4.*",
+    +         "symfony/cache": "5.0.*",
+    -         "symfony/config": "4.4.*",
+    +         "symfony/config": "5.0.*",
+    -         "symfony/console": "4.4.*",
+    +         "symfony/console": "5.0.*",
             "...": "...",
 
             "...": "A few libraries starting with
-                    symfony/ follow their versioning scheme. You
+                    symfony/ follow their own versioning scheme. You
                     do not need to update these versions: you can
                     upgrade them independently whenever you want",
             "symfony/monolog-bundle": "^3.5",
         },
         "...": "...",
     }
 
-Your ``composer.json`` file should also have an ``extra`` block that you will
-*also* need to update:
-
-.. code-block:: diff
-
-    "extra": {
-        "symfony": {
-            "...": "...",
-    -         "require": "4.4.*"
-    +         "require": "5.0.*"
-        }
-    }
-
 At the bottom of your ``composer.json`` file, in the ``extra`` block you can
 find a data setting for the Symfony version. Make sure to also upgrade
 this one. For instance, update it to ``5.0.*`` to upgrade to Symfony 5.0:
 
-.. code-block:: json
+.. code-block:: diff
 
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "5.0.*"
+    -       "require": "4.4.*"
+    +       "require": "5.0.*"
         }
     }