You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository was archived by the owner on Nov 19, 2024. It is now read-only.
Copy file name to clipboardExpand all lines: src/guides/v2.3/comp-mgr/cli/cli-upgrade.md
+58-18Lines changed: 58 additions & 18 deletions
Original file line number
Diff line number
Diff line change
@@ -41,10 +41,19 @@ Complete the following prerequisites to prepare your environment before starting
41
41
42
42
The plugin partially automates the manual upgrade by identifying and helping you resolve dependency conflicts instead of requiring you to identify and fix them manually.
43
43
44
-
To install the plugin:
44
+
To install the plugin when using PHP 7.3 or higher:
1. Indicate the Magento packages, both the edition (`community` or `enterprise`) and the version (`{{ page.guide_version }}.0`), that you want to upgrade to.
82
+
1. Choose one of the following `composer` commands based on the PHP version, and run the commandto upgrade your instance.
74
83
75
-
{:.bs-callout-info}
76
-
The first time you upgrade using the plugin, you can interactively view and update any out-of-date values that may be remaining from previous versions.
77
-
To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
To override all conflicting custom values with the expected Magento values, re-run the `composer require`command with the `--use-default-magento-values` option.
96
+
where:
80
97
81
-
{:.bs-callout-tip}
82
-
Use `composer require --help` to learn more about available options.
83
-
To learn more about usage of the plugin, refer to the [Plugin Usage](https://github.com/magento/composer-root-update-plugin/blob/0.1/src/Magento/ComposerRootUpdatePlugin/README.md#usage).
98
+
`<product>` - (Required) The package to upgrade. For on-premises installations, you must specify either `product-community-edition` or `product-enterprise-edition`.
99
+
100
+
`<version>` - (Required) The version of {{site.data.var.ce}} or {{site.data.var.ce}} you are upgrading to. For example, `2.3.7`.
101
+
102
+
`--no-update` - (Required) Disables the automatic update of the dependencies.
103
+
104
+
`--interactive-root-conflicts` or `interactive-magento-conflicts` - (Optional) Allows you to interactively view and update any out-of-date values from previous versions.
105
+
106
+
`--force-root-updates` or `--use-default-magento-values` - (Optional) Overrides all conflicting custom values with the expected Magento values.
107
+
108
+
`--help` - (Optional) Provides usage details about the plugin.
109
+
110
+
If neither `--interactive-root-conflicts` nor `--force-root-updates` (or their PHP 7.2 equivalents) are specified, the command keeps the existing values that are in conflict and displays a warning message.
111
+
112
+
To learn more about the plugin, refer to one of the following Plugin Usage README files:
113
+
114
+
- [PHP 7.3 or higher](https://github.com/magento/composer-root-update-plugin/blob/develop/src/Magento/ComposerRootUpdatePlugin/README.md)
115
+
- [PHP 7.2 or lower](https://github.com/magento/composer-root-update-plugin/blob/1.1/src/Magento/ComposerRootUpdatePlugin/README.md)
composer show magento/product-enterprise-edition 2.3.* --all | grep -m 1 versions
110
144
```
111
145
112
146
</div>
113
147
148
+
1. Update the dependencies.
149
+
150
+
```bash
151
+
composer update
152
+
```
153
+
114
154
### Example - Minor release
115
155
116
156
Minor releases contain new features, quality fixes, and security fixes. Use Composer to specify a minor release. For example, to specify the {{site.data.var.ee}} 2.3.7 metapackage:
Quality patches primarily contain functional _and_ security fixes. However, they can also sometimes contain new, backward-compatible features. Use Composer to download a quality patch. For example, to specify the {{site.data.var.ee}} 2.3.7 metapackage:
Security patches contain security fixes only. They are designed to make the upgrade process faster and easier.
133
173
134
-
Security patches use the Composer naming convention `2.3.6-px`. Use Composer to specify a patch. For example, to download the {{site.data.var.ce}} 2.3.6-p1 metapackage:
174
+
Security patches use the Composer naming convention `2.3.x-px`. Use Composer to specify a patch. For example, to download the {{site.data.var.ce}} 2.3.6-p1 metapackage:
Copy file name to clipboardExpand all lines: src/guides/v2.4/comp-mgr/cli/cli-upgrade.md
+43-21Lines changed: 43 additions & 21 deletions
Original file line number
Diff line number
Diff line change
@@ -18,13 +18,16 @@ You can upgrade your Magento application from the command line if you installed
18
18
{:.bs-callout-info}
19
19
Do not use this method to upgrade if you cloned the Magento 2 GitHub repository. Instead, see [Update Magento][] for upgrade instructions.
20
20
21
-
The following instructions show you how to upgrade Magento using Composer. Magento 2.4.2 introduced support for Composer 2. If you are attempting to upgrade from Magento <2.4.1, you must first upgrade to a version of Magento that is compatible with Composer 2 (for example, 2.4.2) using Composer 1 _before_ upgrading to Composer 2 for Magento >2.4.2 upgrades.
21
+
The following instructions show you how to upgrade Magento using Composer. Magento 2.4.2 introduced support for Composer 2. If you are attempting to upgrade from Magento <2.4.1, you must first upgrade to a version of Magento that is compatible with Composer 2 (for example, 2.4.2) using Composer 1 _before_ upgrading to Composer 2 for Magento >2.4.2 upgrades. In addition, you must be running a [supported version]({{page.baseurl}}/install-gde/system-requirements.html) of PHP.
22
+
23
+
{:.bs-callout-warning}
24
+
The procedure for upgrading {{site.data.var.ce}} and {{site.data.var.ee}} has changed. You must install a new version of the `magento/composer-root-update-plugin` package. In addition, the commands for upgrading have changed from `composer require magento/<package_name>` to `composer require-commerce magento/<package_name>`.
22
25
23
26
## Before you begin {#prerequisites}
24
27
25
28
Complete the following prerequisites to prepare your environment before starting the upgrade process:
26
29
27
-
-**Determine whether your current catalog search engine is supported**-Avoid significant upgrade errors by ensuring your search engine complies with 2.3 requirements. See [Check the catalog search engine] for more details.
30
+
-**Determine whether your current catalog search engine is supported**-Avoid significant upgrade errors by ensuring your search engine complies with 2.4 requirements. See [Check the catalog search engine] for more details.
28
31
-**Complete the Update and upgrade checklist**—To avoid possible errors during installation or upgrading, complete the [Update and upgrade checklist].
29
32
-**Set the `pub/` directory root**—See [Modify docroot to improve security][] for more details.
30
33
-**Check PHP and environment settings**—Verify that your PHP and other environment settings are compatible with the [system requirements].
@@ -46,7 +49,7 @@ Complete the following prerequisites to prepare your environment before starting
1. Indicate the Magento packages, both the edition (`community` or `enterprise`) and the version (`{{ page.guide_version }}.0`), that you want to upgrade to.
78
+
1. Run the `composer require-commerce`command to upgrade your instance. The command has the following syntax:
76
79
77
-
{:.bs-callout-info}
78
-
The first time you upgrade using the plugin, you can interactively view and update any out-of-date values that may be remaining from previous versions.
79
-
To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
`<product>` - (Required) The package to upgrade. For on-premises installations, this value must be either `product-community-edition` or `product-enterprise-edition`.
87
+
88
+
`<version>` - (Required) The version of {{site.data.var.ce}} or {{site.data.var.ce}} you are upgrading to. For example, `2.4.3`.
89
+
90
+
`--no-update` - (Required) Disables the automatic update of the dependencies.
80
91
81
-
To override all conflicting custom values with the expected Magento values, re-run the `composer require`command with the `--use-default-magento-values` option.
92
+
`--interactive-root-conflicts` - (Optional) Allows you to interactively view and update any out-of-date values from previous versions, or any customized values that do not match the version you are upgrading to.
82
93
83
-
{:.bs-callout-tip}
84
-
Use `composer require --help` to learn more about available options.
85
-
To learn more about usage of the plugin, refer to the [Plugin Usage](https://github.com/magento/composer-root-update-plugin/blob/0.1/src/Magento/ComposerRootUpdatePlugin/README.md#usage).
94
+
`--force-root-updates` - (Optional) Overrides all conflicting custom values with the expected Magento values.
95
+
96
+
`--help` - (Optional) Provides usage details about the plugin.
97
+
98
+
If neither `--interactive-root-conflicts` nor `--force-root-updates` are specified, the command keeps the existing values that are in conflict and displays a warning message.
99
+
100
+
To learn more about the plugin, refer to the [Plugin Usage README](https://github.com/magento/composer-root-update-plugin/blob/develop/src/Magento/ComposerRootUpdatePlugin/README.md).
composer show magento/product-enterprise-edition 2.4.* --available | grep -m 1 versions
112
129
```
113
130
114
131
</div>
115
132
133
+
1. Update the dependencies.
134
+
135
+
```bash
136
+
composer update
137
+
116
138
### Example - Minor release
117
139
118
-
Minor releases contain new features, quality fixes, and security fixes. Use Composer to specify a minor release. For example, to specify the {{site.data.var.ee}} 2.3.7 metapackage:
140
+
Minor releases contain new features, quality fixes, and security fixes. Use Composer to specify a minor release. For example, to specify the {{site.data.var.ee}} 2.4.3 metapackage:
Quality patches primarily contain functional _and_ security fixes. However, they can also sometimes contain new, backward-compatible features. Use Composer to download a quality patch. For example, to specify the {{site.data.var.ee}} 2.3.7 metapackage:
148
+
Quality patches primarily contain functional _and_ security fixes. However, they can also sometimes contain new, backward-compatible features. Use Composer to download a quality patch. For example, to specify the {{site.data.var.ee}} 2.4.1 metapackage:
Security patches contain security fixes only. They are designed to make the upgrade process faster and easier.
135
157
136
-
Security patches use the Composer naming convention `2.3.6-px`. Use Composer to specify a patch. For example, to download the {{site.data.var.ce}} 2.3.6-p1 metapackage:
158
+
Security patches use the Composer naming convention `2.4.x-px`. Use Composer to specify a patch. For example, to download the {{site.data.var.ce}} 2.4.3-p1 metapackage:
Copy file name to clipboardExpand all lines: src/guides/v2.4/comp-mgr/trouble/current-search-engine.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -29,11 +29,11 @@ type='warning'
29
29
content='If you have received this error, Magento is in an inconsistent state, and you cannot access the Admin. We recommend that you revert to your previous version of Magento while you resolve this error. To do this, run one of the following commands:
0 commit comments