From 7128a626a22a52417c0a0917192c554da2acc6f3 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 29 May 2015 15:33:58 -0400 Subject: [PATCH 1/3] Adding a paragraph about updating multiple packages at once during an upgrade --- cookbook/upgrade/_update_all_packages.rst.inc | 3 +++ cookbook/upgrade/_update_dep_errors.rst.inc | 17 +++++++++++++++++ cookbook/upgrade/major_version.rst | 2 ++ cookbook/upgrade/minor_version.rst | 2 ++ 4 files changed, 24 insertions(+) create mode 100644 cookbook/upgrade/_update_dep_errors.rst.inc diff --git a/cookbook/upgrade/_update_all_packages.rst.inc b/cookbook/upgrade/_update_all_packages.rst.inc index 95e1c63f954..ad4c51c6d49 100644 --- a/cookbook/upgrade/_update_all_packages.rst.inc +++ b/cookbook/upgrade/_update_all_packages.rst.inc @@ -1,3 +1,6 @@ +Upgrading other Packages +~~~~~~~~~~~~~~~~~~~~~~~~ + You may also want to upgrade the rest of your libraries. If you've done a good job with your `version constraints`_ in ``composer.json``, you can do this safely by running: diff --git a/cookbook/upgrade/_update_dep_errors.rst.inc b/cookbook/upgrade/_update_dep_errors.rst.inc new file mode 100644 index 00000000000..d99cb2ddb39 --- /dev/null +++ b/cookbook/upgrade/_update_dep_errors.rst.inc @@ -0,0 +1,17 @@ +Dependency Errors +~~~~~~~~~~~~~~~~~ + +If you get a dependency error, it may just mean that you *also* need to upgrade +that package too. For example, Symfony 2.7 requires a higher version of Twig, +so just upgrading ``symfony/symfony`` alone may give you an error. In this +case, try adding the package in question to the ``update`` statement: + + $ composer update symfony/symfony twig/twig + +If this still doesn't work, your ``composer.json`` file may specify a version +for a library that is not compatible with the newer Symfony version. In that +case, updating that library to a newer version in ``composer.json`` may solve +the issue. + +Or, you may have deeper issues where different libraries depend on conflicting +versions of other libraries. Check your error message to debug. diff --git a/cookbook/upgrade/major_version.rst b/cookbook/upgrade/major_version.rst index 10fcafbbf83..9f2a52e183c 100644 --- a/cookbook/upgrade/major_version.rst +++ b/cookbook/upgrade/major_version.rst @@ -98,6 +98,8 @@ Next, use Composer to download new versions of the libraries: $ composer update symfony/symfony +.. include:: /cookbook/upgrade/_update_dep_errors.rst.inc + .. include:: /cookbook/upgrade/_update_all_packages.rst.inc .. _upgrade-major-symfony-after: diff --git a/cookbook/upgrade/minor_version.rst b/cookbook/upgrade/minor_version.rst index 55b63bb0580..78f829e2a3b 100644 --- a/cookbook/upgrade/minor_version.rst +++ b/cookbook/upgrade/minor_version.rst @@ -41,6 +41,8 @@ Next, use Composer to download new versions of the libraries: $ composer update symfony/symfony +.. include:: /cookbook/upgrade/_update_dep_errors.rst.inc + .. include:: /cookbook/upgrade/_update_all_packages.rst.inc .. _`upgrade-minor-symfony-code`: From 737c74a5decbd1752a59aec03b55066f39ae7419 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Mon, 8 Jun 2015 14:42:21 -0400 Subject: [PATCH 2/3] using --with-dependencies --- cookbook/upgrade/_update_dep_errors.rst.inc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cookbook/upgrade/_update_dep_errors.rst.inc b/cookbook/upgrade/_update_dep_errors.rst.inc index d99cb2ddb39..6b2eaea3c40 100644 --- a/cookbook/upgrade/_update_dep_errors.rst.inc +++ b/cookbook/upgrade/_update_dep_errors.rst.inc @@ -1,12 +1,14 @@ Dependency Errors ~~~~~~~~~~~~~~~~~ -If you get a dependency error, it may just mean that you *also* need to upgrade -that package too. For example, Symfony 2.7 requires a higher version of Twig, -so just upgrading ``symfony/symfony`` alone may give you an error. In this -case, try adding the package in question to the ``update`` statement: +If you get a dependency error, it may simply mean that you need to upgrade +other Symfony dependencies too. In that case, try the following command: - $ composer update symfony/symfony twig/twig + $ composer update symfony/symfony --with-dependencies + +This updates ``symfony/symfony`` and *all* packages that it depends on, +will include several other packages. By using tight version constraints in +``composer.json``, you can control what versions each library upgrades to. If this still doesn't work, your ``composer.json`` file may specify a version for a library that is not compatible with the newer Symfony version. In that From 0100e725b184f5bcaea09421a287c86f9e840295 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Mon, 22 Jun 2015 18:07:01 -0400 Subject: [PATCH 3/3] fixing bad wording --- cookbook/upgrade/_update_dep_errors.rst.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/upgrade/_update_dep_errors.rst.inc b/cookbook/upgrade/_update_dep_errors.rst.inc index 6b2eaea3c40..663c0091f58 100644 --- a/cookbook/upgrade/_update_dep_errors.rst.inc +++ b/cookbook/upgrade/_update_dep_errors.rst.inc @@ -6,8 +6,8 @@ other Symfony dependencies too. In that case, try the following command: $ composer update symfony/symfony --with-dependencies -This updates ``symfony/symfony`` and *all* packages that it depends on, -will include several other packages. By using tight version constraints in +This updates ``symfony/symfony`` and *all* packages that it depends on, which will +include several other packages. By using tight version constraints in ``composer.json``, you can control what versions each library upgrades to. If this still doesn't work, your ``composer.json`` file may specify a version