Merge branch '7.0' into 7.1

* 7.0:
  chore: document major upgrade with latest versions
  chore: document minor upgrade with latest versions

Author: javiereguiluz

setup/upgrade_major.rst

@@ -1,4 +1,4 @@
-Upgrading a Major Version (e.g. 5.4.0 to 6.0.0)
+Upgrading a Major Version (e.g. 6.4.0 to 7.0.0)
 ===============================================
 
 Every two years, Symfony releases a new major version release (the first number
@@ -27,10 +27,10 @@ backwards incompatible changes. To accomplish this, the "old" (e.g. functions,
 classes, etc) code still works, but is marked as *deprecated*, indicating that
 it will be removed/changed in the future and that you should stop using it.
 
-When the major version is released (e.g. 6.0.0), all deprecated features and
+When the major version is released (e.g. 7.0.0), all deprecated features and
 functionality are removed. So, as long as you've updated your code to stop
 using these deprecated features in the last version before the major (e.g.
-``5.4.*``), you should be able to upgrade without a problem. That means that
+``6.4.*``), you should be able to upgrade without a problem. That means that
 you should first :doc:`upgrade to the last minor version </setup/upgrade_minor>`
 (e.g. 5.4) so that you can see *all* the deprecations.
 
@@ -107,7 +107,7 @@ done!
 .. sidebar:: Using the Weak Deprecations Mode
 
     Sometimes, you can't fix all deprecations (e.g. something was deprecated
-    in 5.4 and you still need to support 5.3). In these cases, you can still
+    in 6.4 and you still need to support 6.3). In these cases, you can still
     use the bridge to fix as many deprecations as possible and then allow
     more of them to make your tests pass again. You can do this by using the
     ``SYMFONY_DEPRECATIONS_HELPER`` env variable:
@@ -144,35 +144,33 @@ starting with ``symfony/`` to the new major version:
           "...": "...",
 
           "require": {
-    -         "symfony/cache": "5.4.*",
-    +         "symfony/cache": "6.0.*",
-    -         "symfony/config": "5.4.*",
-    +         "symfony/config": "6.0.*",
-    -         "symfony/console": "5.4.*",
-    +         "symfony/console": "6.0.*",
+    -         "symfony/config": "6.4.*",
+    +         "symfony/config": "7.0.*",
+    -         "symfony/console": "6.4.*",
+    +         "symfony/console": "7.0.*",
               "...": "...",
 
               "...": "A few libraries starting with symfony/ follow their own
                       versioning scheme (e.g. symfony/polyfill-[...],
                       symfony/ux-[...], symfony/[...]-bundle).
                       You do not need to update these versions: you can
                       upgrade them independently whenever you want",
-              "symfony/monolog-bundle": "^3.5",
+              "symfony/monolog-bundle": "^3.10",
           },
           "...": "...",
       }
 
 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 ``6.0.*`` to upgrade to Symfony 6.0:
+this one. For instance, update it to ``7.0.*`` to upgrade to Symfony 7.0:
 
 .. code-block:: diff
 
       "extra": {
           "symfony": {
               "allow-contrib": false,
-    -       "require": "5.4.*"
-    +       "require": "6.0.*"
+    -       "require": "6.4.*"
+    +       "require": "7.0.*"
           }
       }
 
@@ -215,13 +213,13 @@ included in the Symfony repository for any BC break that you need to be aware of
 Upgrading to Symfony 6: Add Native Return Types
 -----------------------------------------------
 
-Symfony 6 will come with native PHP return types to (almost all) methods.
+Symfony 6 and Symfony 7 added native PHP return types to (almost all) methods.
 
 In PHP, if the parent has a return type declaration, any class implementing
 or overriding the method must have the return type as well. However, you
 can add a return type before the parent adds one. This means that it is
 important to add the native PHP return types to your classes before
-upgrading to Symfony 6.0. Otherwise, you will get incompatible declaration
+upgrading to Symfony 6.0 or 7.0. Otherwise, you will get incompatible declaration
 errors.
 
 When debug mode is enabled (typically in the dev and test environment),

setup/upgrade_minor.rst

@@ -1,4 +1,4 @@
-Upgrading a Minor Version (e.g. 5.0.0 to 5.1.0)
+Upgrading a Minor Version (e.g. 6.3.0 to 6.4.0)
 ===============================================
 
 If you're upgrading a minor version (where the middle number changes), then
@@ -21,27 +21,25 @@ There are two steps to upgrading a minor version:
 The ``composer.json`` file is configured to allow Symfony packages to be
 upgraded to patch versions. But to upgrade to a new minor version, you will
 probably need to update the version constraint next to each library starting
-``symfony/``. Suppose you are upgrading from Symfony 5.3 to 5.4:
+``symfony/``. Suppose you are upgrading from Symfony 6.3 to 6.4:
 
 .. code-block:: diff
 
       {
           "...": "...",
 
           "require": {
-    -         "symfony/cache": "5.3.*",
-    +         "symfony/cache": "5.4.*",
-    -         "symfony/config": "5.3.*",
-    +         "symfony/config": "5.4.*",
-    -         "symfony/console": "5.3.*",
-    +         "symfony/console": "5.4.*",
+    -         "symfony/config": "6.3.*",
+    +         "symfony/config": "6.4.*",
+    -         "symfony/console": "6.3.*",
+    +         "symfony/console": "6.4.*",
               "...": "...",
 
               "...": "A few libraries starting with
                       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",
+              "symfony/monolog-bundle": "^3.10",
           },
           "...": "...",
       }
@@ -54,8 +52,8 @@ Your ``composer.json`` file should also have an ``extra`` block that you will
       "extra": {
           "symfony": {
               "...": "...",
-    -         "require": "5.3.*"
-    +         "require": "5.4.*"
+    -         "require": "6.3.*"
+    +         "require": "6.4.*"
           }
       }
 
@@ -79,7 +77,7 @@ to your code to get everything working. Additionally, some features you're
 using might still work, but might now be deprecated. While that's fine,
 if you know about these deprecations, you can start to fix them over time.
 
-Every version of Symfony comes with an UPGRADE file (e.g. `UPGRADE-5.4.md`_)
+Every version of Symfony comes with an UPGRADE file (e.g. `UPGRADE-6.4.md`_)
 included in the Symfony directory that describes these changes. If you follow
 the instructions in the document and update your code accordingly, it should be
 safe to update in the future.
@@ -97,5 +95,5 @@ These documents can also be found in the `Symfony Repository`_.
 .. include:: /setup/_update_recipes.rst.inc
 
 .. _`Symfony Repository`: https://github.com/symfony/symfony
-.. _`UPGRADE-5.4.md`: https://github.com/symfony/symfony/blob/5.4/UPGRADE-5.4.md
+.. _`UPGRADE-6.4.md`: https://github.com/symfony/symfony/blob/6.4/UPGRADE-6.4.md
 .. _`Rector`: https://github.com/rectorphp/rector